Revision: bazaar--annotate--1.2--patch-16
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Sat Feb 19 10:36:59 EST 2005
Standard-date: 2005-02-18 23:36:59 GMT
New-files: commands/.arch-ids/export.c.id
    commands/.arch-ids/export.h.id
    commands/.arch-ids/import.c.id
    commands/.arch-ids/import.h.id
    commands/.arch-ids/log.c.id commands/.arch-ids/log.h.id
    commands/export.c commands/export.h commands/import.c
    commands/import.h commands/log.c commands/log.h
    commands/tests/.arch-ids/unit-cmd-export.c.id
    commands/tests/.arch-ids/unit-cmd-import.c.id
    commands/tests/unit-cmd-export.c
    commands/tests/unit-cmd-import.c
    tests/.arch-ids/test-export.sh.id tests/test-export.sh
    tests/test-log.sh
Renamed-files: commands/import.c commands/import-old.c
    commands/import.h commands/import-old.h
Modified-files: commands/archive-mirror.c commands/cmds.c
    commands/import-old.c commands/import-old.h
    libarch/merge.c libarch/project-tree.c
    libarch/project-tree.h tests/Makefile.in
    tests/test-framework tests/test-import-baz.sh
    tests/test-mirror.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-9
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-10
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-11
    jblack@gnuarch.org--2004/baz--log--1.2--base-0
    jblack@gnuarch.org--2004/baz--log--1.2--patch-1
    jblack@gnuarch.org--2004/baz--log--1.2--patch-2
    jblack@gnuarch.org--2004/baz--log--1.2--patch-3
    jblack@gnuarch.org--2004/baz--log--1.2--patch-4
    jblack@gnuarch.org--2004/baz--log--1.2--patch-5
    jblack@gnuarch.org--2004/baz--log--1.2--patch-6
    jblack@gnuarch.org--2004/baz--log--1.2--patch-7
    jblack@gnuarch.org--2004/baz--log--1.2--patch-8
    jblack@gnuarch.org--2004/baz--log--1.2--patch-9
    jblack@gnuarch.org--2004/baz--log--1.2--patch-10
    jblack@gnuarch.org--2004/baz--log--1.2--patch-11
    jblack@gnuarch.org--2004/baz--log--1.2--patch-12
    jblack@gnuarch.org--2004/baz--log--1.2--patch-13
    jblack@gnuarch.org--2004/baz--log--1.2--patch-14
    jblack@gnuarch.org--2004/baz--log--1.2--patch-15
    jblack@gnuarch.org--2004/baz--log--1.2--patch-16
    jblack@gnuarch.org--2004/baz--log--1.2--patch-17
    rob.weir@canonical.com--2004-public/baz--import--0--base-0
    rob.weir@canonical.com--2004-public/baz--import--0--patch-1
    rob.weir@canonical.com--2004-public/baz--import--0--patch-2
    rob.weir@canonical.com--2004-public/baz--import--0--patch-3
    rob.weir@canonical.com--2004-public/baz--import--0--patch-4
    rob.weir@canonical.com--2004-public/baz--import--0--patch-5
    rob.weir@canonical.com--2004-public/baz--import--0--patch-6
    rob.weir@canonical.com--2004-public/baz--import--0--patch-7
    rob.weir@canonical.com--2004-public/baz--import--0--patch-8
    rob.weir@canonical.com--2004-public/baz--import--0--patch-9
    rob.weir@canonical.com--2004-public/baz--import--0--patch-10
    rob.weir@canonical.com--2004-public/baz--import--0--patch-11
    rob.weir@canonical.com--2004-public/baz--import--0--patch-12
    rob.weir@canonical.com--2004-public/baz--import--0--patch-13
    rob.weir@canonical.com--2004-public/baz--naive-export--0--base-0
    rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-1
    rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-2
    rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-3
    rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-4
    robert.collins@canonical.com--general/bazaar--annotate--1.2--patch-16
    thelove@canonical.com/bazaar--devo--1.2--patch-23
    thelove@canonical.com/bazaar--devo--1.2--patch-24
    thelove@canonical.com/bazaar--devo--1.2--patch-25
    thelove@canonical.com/bazaar--devo--1.2--patch-26
    thelove@canonical.com/bazaar--devo--1.2--patch-27
    thelove@canonical.com/bazaar--devo--1.2--patch-28
    thelove@canonical.com/bazaar--devo--1.2--patch-29
    thelove@canonical.com/bazaar--devo--1.2--patch-30
Summary: merge from rf
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-9
   Merge latest baz (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-10
   Added test case: cache not used by archive-mirror

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-11
   Forced cache off for mirroring

 * jblack@gnuarch.org--2004/baz--log--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-15

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-1
   A prime example of how to starting a new command, complete with tests

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-2
   almost have the bare minimum for baz log

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-3
   Trying to fix some include problems

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-4
   Got log minimally working, passes tests 1-7, but still fails 8, because that functionality hasn't been written yet

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-5
   Finishing up log homework

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-6
   A bit more work for baz log

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-7
   baz log -r -r seems to work fully

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-8
   relative range starting to work, but maybe backwards

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-9
   -r now works with baz log

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-10
   baz log now does -f

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-11
   Forgot to clean a couple tests up

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-12
   fixing up test dev/null thing that works here but not in pqm

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-13
   Merging thelove

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-14
   Fixing that test with the blasted sftp fix

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-15
   Putting a break between full logs

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-16
   Added creator field to short logs

 * jblack@gnuarch.org--2004/baz--log--1.2--patch-17
   Didn't check the ancestor return close enough

 * rob.weir@canonical.com--2004-public/baz--import--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-122

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-1
   Initial new import command.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-2
   Drop some useless stuff.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-3
   Re-jig, include compatiblity code.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-4
   Tidy up, re-enable compat test.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-5
   Make tests useful.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-6
   Add debugging goo.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-7
   Factor out file adding.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-8
   Add deep files, and test it better.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-9
   Er, fix the tests a bit more so they actually pass.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-10
   Er, fix the tests a bit more so they actually pass, again!.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-11
   Sync up with 1.2.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-12
   Sync up with 1.2.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-13
   Fix some memory allocation bugs in import.

 * rob.weir@canonical.com--2004-public/baz--naive-export--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-120

 * rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-1
   Initial attempt.

 * rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-2
   Add test for nested dirs.

 * rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-3
   Merge in changes from 1.1.

 * rob.weir@canonical.com--2004-public/baz--naive-export--0--patch-4
   Merge in changes from 1.2.

 * thelove@canonical.com/bazaar--devo--1.2--patch-23
   Adding the start of a log command. handles -f and -r

 * thelove@canonical.com/bazaar--devo--1.2--patch-24
   Add export command.

 * thelove@canonical.com/bazaar--devo--1.2--patch-25
   Add export command.

 * thelove@canonical.com/bazaar--devo--1.2--patch-26
   Forced mirroring to not use the cache

 * thelove@canonical.com/bazaar--devo--1.2--patch-27
   Making output for log more presentable

 * thelove@canonical.com/bazaar--devo--1.2--patch-28
   Adding creator field to short logs for log

 * thelove@canonical.com/bazaar--devo--1.2--patch-29
   Checking ancestory more closely in log

 * thelove@canonical.com/bazaar--devo--1.2--patch-30
   Add new import interface.

